Add EIS badges to Person Canvas redux (CFM-417) #371
+304
−165
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
benno
requested changes
Mar 13, 2026
Comment on lines
98
to
116
| $eisLookupTable = $extIdentities | ||
| ->find('list', [ | ||
| 'keyField' => 'id', | ||
| 'valueField' => 'description', | ||
| ]) | ||
| ->select([ | ||
| 'id' => 'ExternalIdentities.id', | ||
| 'description' => 'ExternalIdentitySources.description', | ||
| ]) | ||
| ->innerJoinWith('ExtIdentitySourceRecords.ExternalIdentitySources') | ||
| ->where([ | ||
| 'ExternalIdentities.person_id' => $personId, | ||
| ]) | ||
| ->enableHydration(false) | ||
| ->toArray(); | ||
|
|
||
| $this->set('vv_external_identity_sources', $eisLookupTable); | ||
| } |
There was a problem hiding this comment.
I get nervous when joins are used, since we've historically had problems with joins not working correctly with ChangelogBehavior. This is also a very "SQL" way of looking at data. A more Cake-centric approach would be something like (I didn't test this exact syntax, in particular the combine path notation may need some debugging)
// Pull External Identities with External Identity Source information as associated records
$records = $extIdentities->find()->where(['person_id' => $personId])->contain(['ExtIdentitySourceRecords' => 'ExternalIdentitySources'])->all();
// Use Hash to pull a mapping of the record ID to the EIS description
$mapping = $records->combine('id', 'ext_identity_source_record.ext_identity_source.description')->toArray();
arlen
commented
Mar 19, 2026
Comment on lines
+99
to
+113
| // Pull External Identities with External Identity Source information as associated records | ||
| $records = $extIdentities | ||
| ->find() | ||
| ->where(['ExternalIdentities.person_id' => $personId]) | ||
| ->contain(['ExtIdentitySourceRecords' => ['ExternalIdentitySources']]) | ||
| ->all(); | ||
|
|
||
| // Combine into a flat record id => EIS description lookup array | ||
| $eisLookupTable = (new \Cake\Collection\Collection($records)) | ||
| ->filter(function ($record) { | ||
| // Only include rows that actually have an EIS description | ||
| return !empty($record->ext_identity_source_record->external_identity_source->description); | ||
| }) | ||
| ->combine('id', 'ext_identity_source_record.external_identity_source.description') | ||
| ->toArray(); |
There was a problem hiding this comment.
The eisLookupTable is now built using standard cakephp approaches. The filter() allows us to only return rows with EISes, allowing the returned array to be identical to the original join approach.
…ipt components (CFM-417)
arlen
force-pushed
the
feature-cfm417-eisPersonCanvas
branch
from
c7992d8 to
aeef1d5
Compare
|
Rebased against the latest develop |
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds the EIS badges to the Person Canvas MVEAs when they exist. With the addition of the extra field, it became apparent that the data on the MVEAs needed better structure. This PR addresses that as well by converting the MVEA layouts into tables.